Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 16:16:05 +0000 (09:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 16:16:05 +0000 (09:16 -0700)

Trivial merge